Skip to content

Commit f74fb57

Browse files
committed
Revert "popoverTarget -> popoverTargetElement"
This reverts commit b394c00.
1 parent 0f4f180 commit f74fb57

File tree

7 files changed

+5
-58
lines changed

7 files changed

+5
-58
lines changed

fixtures/attribute-behavior/AttributeTableSnapshot.md

+3-28
Original file line numberDiff line numberDiff line change
@@ -8476,7 +8476,7 @@
84768476
## `popoverTarget` (on `<button>` inside `<div>`)
84778477
| Test Case | Flags | Result |
84788478
| --- | --- | --- |
8479-
| `popoverTarget=(string)`| (initial, warning)| `<null>` |
8479+
| `popoverTarget=(string)`| (initial)| `<null>` |
84808480
| `popoverTarget=(empty string)`| (initial)| `<null>` |
84818481
| `popoverTarget=(array with string)`| (initial)| `<null>` |
84828482
| `popoverTarget=(empty array)`| (initial)| `<null>` |
@@ -8498,31 +8498,6 @@
84988498
| `popoverTarget=(null)`| (initial)| `<null>` |
84998499
| `popoverTarget=(undefined)`| (initial)| `<null>` |
85008500

8501-
## `popoverTargetElement` (on `<button>` inside `<div>`)
8502-
| Test Case | Flags | Result |
8503-
| --- | --- | --- |
8504-
| `popoverTargetElement=(string)`| (initial)| `<null>` |
8505-
| `popoverTargetElement=(empty string)`| (initial)| `<null>` |
8506-
| `popoverTargetElement=(array with string)`| (initial)| `<null>` |
8507-
| `popoverTargetElement=(empty array)`| (initial)| `<null>` |
8508-
| `popoverTargetElement=(object)`| (initial)| `<null>` |
8509-
| `popoverTargetElement=(numeric string)`| (initial)| `<null>` |
8510-
| `popoverTargetElement=(-1)`| (initial)| `<null>` |
8511-
| `popoverTargetElement=(0)`| (initial)| `<null>` |
8512-
| `popoverTargetElement=(integer)`| (initial)| `<null>` |
8513-
| `popoverTargetElement=(NaN)`| (initial, warning)| `<null>` |
8514-
| `popoverTargetElement=(float)`| (initial)| `<null>` |
8515-
| `popoverTarget=(true)`| (initial, warning)| `<null>` |
8516-
| `popoverTargetElement=(false)`| (initial, warning)| `<null>` |
8517-
| `popoverTargetElement=(string 'true')`| (initial)| `<null>` |
8518-
| `popoverTargetElement=(string 'false')`| (initial)| `<null>` |
8519-
| `popoverTargetElement=(string 'on')`| (initial)| `<null>` |
8520-
| `popoverTargetElement=(string 'off')`| (initial)| `<null>` |
8521-
| `popoverTargetElement=(symbol)`| (initial, warning)| `<null>` |
8522-
| `popoverTargetElement=(function)`| (initial, warning)| `<null>` |
8523-
| `popoverTargetElement=(null)`| (initial)| `<null>` |
8524-
| `popoverTargetElement=(undefined)`| (initial)| `<null>` |
8525-
85268501
## `popoverTargetAction` (on `<button>` inside `<div>`)
85278502
| Test Case | Flags | Result |
85288503
| --- | --- | --- |
@@ -8537,8 +8512,8 @@
85378512
| `popoverTargetAction=(integer)`| (initial)| `"toggle"` |
85388513
| `popoverTargetAction=(NaN)`| (initial, warning)| `"toggle"` |
85398514
| `popoverTargetAction=(float)`| (initial)| `"toggle"` |
8540-
| `popoverTargetAction=(true)`| (initial)| `"toggle"` |
8541-
| `popoverTargetAction=(false)`| (initial)| `"toggle"` |
8515+
| `popoverTargetAction=(true)`| (initial, warning)| `"toggle"` |
8516+
| `popoverTargetAction=(false)`| (initial, warning)| `"toggle"` |
85428517
| `popoverTargetAction=(string 'true')`| (initial)| `"toggle"` |
85438518
| `popoverTargetAction=(string 'false')`| (initial)| `"toggle"` |
85448519
| `popoverTargetAction=(string 'on')`| (initial)| `"toggle"` |

fixtures/attribute-behavior/src/attributes.js

-5
Original file line numberDiff line numberDiff line change
@@ -1453,11 +1453,6 @@ const attributes = [
14531453
read: element => element.popoverTargetElement,
14541454
tagName: 'button',
14551455
},
1456-
{
1457-
name: 'popoverTargetElement',
1458-
read: element => element.popoverTargetElement,
1459-
tagName: 'button',
1460-
},
14611456
{name: 'popoverTargetAction', overrideStringValue: 'show', tagName: 'button'},
14621457
{
14631458
name: 'poster',

packages/react-dom-bindings/src/client/ReactDOMComponent.js

-2
Original file line numberDiff line numberDiff line change
@@ -1815,8 +1815,6 @@ function getPropNameFromAttributeName(attrName: string): string {
18151815
return 'className';
18161816
case 'for':
18171817
return 'htmlFor';
1818-
case 'popopverTarget':
1819-
return 'popopverTargetElement';
18201818
// TODO: The rest of the aliases.
18211819
default:
18221820
return attrName;

packages/react-dom-bindings/src/shared/getAttributeAlias.js

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
const aliases = new Map([
1111
['acceptCharset', 'accept-charset'],
1212
['htmlFor', 'for'],
13-
['popoverTargetElement', 'popoverTarget'],
1413
['httpEquiv', 'http-equiv'],
1514
// HTML and SVG attributes, but the SVG attribute is case sensitive.],
1615
['crossOrigin', 'crossorigin'],

packages/react-dom-bindings/src/shared/possibleStandardNames.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,8 @@ const possibleStandardNames = {
345345
pointsaty: 'pointsAtY',
346346
pointsatz: 'pointsAtZ',
347347
popover: 'popover',
348-
popovertarget: 'popoverTargetElement',
348+
popovertarget: 'popoverTarget',
349349
popovertargetaction: 'popoverTargetAction',
350-
popovertargetelement: 'popoverTargetElement',
351350
prefix: 'prefix',
352351
preservealpha: 'preserveAlpha',
353352
preserveaspectratio: 'preserveAspectRatio',

packages/react-dom/src/__tests__/ReactDOMComponent-test.js

-19
Original file line numberDiff line numberDiff line change
@@ -2926,18 +2926,6 @@ describe('ReactDOMComponent', () => {
29262926
}).toErrorDev(
29272927
'Warning: Invalid DOM property `autofocus`. Did you mean `autoFocus`?\n in input',
29282928
);
2929-
2930-
await expect(async () => {
2931-
const container = document.createElement('div');
2932-
const root = ReactDOMClient.createRoot(container);
2933-
await act(() => {
2934-
root.render(
2935-
React.createElement('button', {popoverTarget: 'some-element'}),
2936-
);
2937-
});
2938-
}).toErrorDev(
2939-
'Warning: Invalid DOM property `popoverTarget`. Did you mean `popoverTargetElement`?\n in button',
2940-
);
29412929
});
29422930

29432931
it('should suggest property name if available (ssr)', () => {
@@ -2955,13 +2943,6 @@ describe('ReactDOMComponent', () => {
29552943
).toErrorDev(
29562944
'Warning: Invalid DOM property `autofocus`. Did you mean `autoFocus`?\n in input',
29572945
);
2958-
expect(() =>
2959-
ReactDOMServer.renderToString(
2960-
React.createElement('button', {popoverTarget: 'some-element'}),
2961-
),
2962-
).toErrorDev(
2963-
'Warning: Invalid DOM property `popoverTarget`. Did you mean `popoverTargetElement`?\n in button',
2964-
);
29652946
});
29662947
});
29672948

packages/react-dom/src/events/plugins/__tests__/SimpleEventPlugin-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ describe('SimpleEventPlugin', function () {
487487
await act(() => {
488488
root.render(
489489
<>
490-
<button popoverTargetElement="popover">Toggle popover</button>
490+
<button popoverTarget="popover">Toggle popover</button>
491491
<div id="popover" popover="" onToggle={onToggle}>
492492
popover content
493493
</div>

0 commit comments

Comments
 (0)