Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ exports[`AppRegistry runApplication styles roots in different documents 1`] = `
".r-pointerEvents-105ug2t {pointer-events: auto !important;}",
".r-pointerEvents-12vffkv * {pointer-events: auto;}",
".r-pointerEvents-12vffkv {pointer-events: none !important;}",
".r-pointerEvents-633pao * {pointer-events: none;}",
".r-pointerEvents-633pao {pointer-events: none !important;}",
".r-pointerEvents-ah5dr5>* {pointer-events: none;}",
".r-pointerEvents-ah5dr5 * {pointer-events: none;}",
".r-pointerEvents-ah5dr5 {pointer-events: auto !important;}",
".r-position-u8s1d {position: absolute;}",
".r-right-zchlnj {right: 0px;}",
Expand All @@ -45,8 +46,9 @@ exports[`AppRegistry runApplication styles roots in different documents 2`] = `
".r-pointerEvents-105ug2t {pointer-events: auto !important;}",
".r-pointerEvents-12vffkv * {pointer-events: auto;}",
".r-pointerEvents-12vffkv {pointer-events: none !important;}",
".r-pointerEvents-633pao * {pointer-events: none;}",
".r-pointerEvents-633pao {pointer-events: none !important;}",
".r-pointerEvents-ah5dr5>* {pointer-events: none;}",
".r-pointerEvents-ah5dr5 * {pointer-events: none;}",
".r-pointerEvents-ah5dr5 {pointer-events: auto !important;}",
".r-position-u8s1d {position: absolute;}",
".r-right-zchlnj {right: 0px;}",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ describe('AppRegistry', () => {
.r-pointerEvents-105ug2t{pointer-events:auto!important;}
.r-pointerEvents-12vffkv * {pointer-events:auto;}
.r-pointerEvents-12vffkv{pointer-events:none!important;}
.r-pointerEvents-633pao * {pointer-events:none;}
.r-pointerEvents-633pao{pointer-events:none!important;}
.r-pointerEvents-ah5dr5>*{pointer-events:none;}
.r-pointerEvents-ah5dr5 * {pointer-events:none;}
.r-pointerEvents-ah5dr5{pointer-events:auto!important;}
.r-position-u8s1d{position:absolute;}
.r-right-zchlnj{right:0px;}
Expand Down Expand Up @@ -121,8 +122,9 @@ describe('AppRegistry', () => {
.r-pointerEvents-105ug2t{pointer-events:auto!important;}
.r-pointerEvents-12vffkv * {pointer-events:auto;}
.r-pointerEvents-12vffkv{pointer-events:none!important;}
.r-pointerEvents-633pao * {pointer-events:none;}
.r-pointerEvents-633pao{pointer-events:none!important;}
.r-pointerEvents-ah5dr5>*{pointer-events:none;}
.r-pointerEvents-ah5dr5 * {pointer-events:none;}
.r-pointerEvents-ah5dr5{pointer-events:auto!important;}
.r-position-u8s1d{position:absolute;}
.r-right-zchlnj{right:0px;}
Expand Down Expand Up @@ -172,8 +174,9 @@ describe('AppRegistry', () => {
.r-pointerEvents-105ug2t{pointer-events:auto!important;}
.r-pointerEvents-12vffkv * {pointer-events:auto;}
.r-pointerEvents-12vffkv{pointer-events:none!important;}
.r-pointerEvents-633pao * {pointer-events:none;}
.r-pointerEvents-633pao{pointer-events:none!important;}
.r-pointerEvents-ah5dr5>*{pointer-events:none;}
.r-pointerEvents-ah5dr5 * {pointer-events:none;}
.r-pointerEvents-ah5dr5{pointer-events:auto!important;}
.r-position-u8s1d{position:absolute;}
.r-right-zchlnj{right:0px;}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ describe('StyleSheet/compile', () => {
],
[
[
".r-pointerEvents-ah5dr5>*{pointer-events:none;}",
".r-pointerEvents-ah5dr5 * {pointer-events:none;}",
".r-pointerEvents-ah5dr5{pointer-events:auto!important;}",
],
3,
Expand Down Expand Up @@ -177,6 +177,30 @@ describe('StyleSheet/compile', () => {
`);
});

test('when parent is pointer-events=none, pointer-events=none applied to children', () => {
const result = atomic({
pointerEvents: 'none'
});

expect(result).toMatchInlineSnapshot(`
[
{
"$$css": true,
"pointerEvents": "r-pointerEvents-633pao",
},
[
[
[
".r-pointerEvents-633pao * {pointer-events:none;}",
".r-pointerEvents-633pao{pointer-events:none!important;}",
],
3,
],
],
]
`);
});

test('when parent is pointer-events=box-none, pointer-events=auto applied to children', () => {
const result = atomic({
pointerEvents: 'box-none'
Expand Down
23 changes: 13 additions & 10 deletions packages/react-native-web/src/exports/StyleSheet/compiler/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -379,20 +379,23 @@ function createAtomicRules(identifier: string, property, value): Rules {

// Polyfill for additional 'pointer-events' values
// See d13f78622b233a0afc0c7a200c0a0792c8ca9e58
// See https://reactnative.dev/docs/view#pointerevents
case 'pointerEvents': {
let finalValue = value;
if (value === 'auto' || value === 'box-only') {
if (value === 'auto') {
finalValue = 'auto!important';
if (value === 'box-only') {
const block = createDeclarationBlock({ pointerEvents: 'none' });
rules.push(`${selector}>*${block}`);
}
} else if (value === 'none' || value === 'box-none') {
} else if (value === 'none') {
finalValue = 'none!important';
if (value === 'box-none') {
const block = createDeclarationBlock({ pointerEvents: 'auto' });
rules.push(`${selector} * ${block}`);
}
const block = createDeclarationBlock({ pointerEvents: 'none' });
rules.push(`${selector} * ${block}`);
} else if (value === 'box-none') {
finalValue = 'none!important';
const block = createDeclarationBlock({ pointerEvents: 'auto' });
rules.push(`${selector} * ${block}`);
} else if (value === 'box-only') {
finalValue = 'auto!important';
const block = createDeclarationBlock({ pointerEvents: 'none' });
rules.push(`${selector} * ${block}`);
}
const block = createDeclarationBlock({ pointerEvents: finalValue });
rules.push(`${selector}${block}`);
Expand Down