Skip to content

Commit 8879dbb

Browse files
yomotsupull[bot]
authored andcommitted
fix: remove methods for CSSRenderer Objects within iframe (#29663)
* fix: remove methods for CSSRenderer Objects within iframe * Element.remove() is widely supported
1 parent 059b7f5 commit 8879dbb

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

examples/jsm/renderers/CSS2DRenderer.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ class CSS2DObject extends Object3D {
2626

2727
this.traverse( function ( object ) {
2828

29-
if ( object.element instanceof Element && object.element.parentNode !== null ) {
29+
if (
30+
object.element instanceof object.element.ownerDocument.defaultView.Element &&
31+
object.element.parentNode !== null
32+
) {
3033

31-
object.element.parentNode.removeChild( object.element );
34+
object.element.remove();
3235

3336
}
3437

@@ -135,7 +138,7 @@ class CSS2DRenderer {
135138
return;
136139

137140
}
138-
141+
139142
if ( object.isCSS2DObject ) {
140143

141144
_vector.setFromMatrixPosition( object.matrixWorld );

examples/jsm/renderers/CSS3DRenderer.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,12 @@ class CSS3DObject extends Object3D {
3232

3333
this.traverse( function ( object ) {
3434

35-
if ( object.element instanceof Element && object.element.parentNode !== null ) {
35+
if (
36+
object.element instanceof object.element.ownerDocument.defaultView.Element &&
37+
object.element.parentNode !== null
38+
) {
3639

37-
object.element.parentNode.removeChild( object.element );
40+
object.element.remove();
3841

3942
}
4043

@@ -254,10 +257,10 @@ class CSS3DRenderer {
254257
function hideObject( object ) {
255258

256259
if ( object.isCSS3DObject ) object.element.style.display = 'none';
257-
260+
258261
for ( let i = 0, l = object.children.length; i < l; i ++ ) {
259262

260-
hideObject( object.children[ i ] );
263+
hideObject( object.children[ i ] );
261264

262265
}
263266

0 commit comments

Comments
 (0)