capricorn86#1217@patch: Check if options are null.

zachlankton · Jan 25, 2024 · 7872f52 · 7872f52
1 parent b7403cc
commit 7872f52
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/packages/happy-dom/src/nodes/character-data/CharacterData.ts b/packages/happy-dom/src/nodes/character-data/CharacterData.ts
@@ -64,7 +64,7 @@ export default abstract class CharacterData extends Node implements ICharacterDa
 		// MutationObserver
 		if (this[PropertySymbol.observers].length > 0) {
 			for (const observer of this[PropertySymbol.observers]) {
-				if (observer.options.characterData) {
+				if (observer.options?.characterData) {
 					observer.report(
 						new MutationRecord({
 							target: this,

diff --git a/packages/happy-dom/src/nodes/element/ElementNamedNodeMap.ts b/packages/happy-dom/src/nodes/element/ElementNamedNodeMap.ts
@@ -116,7 +116,7 @@ export default class ElementNamedNodeMap extends NamedNodeMap {
 				this[PropertySymbol.ownerElement][PropertySymbol.observers]
 			)) {
 				if (
-					observer.options.attributes &&
+					observer.options?.attributes &&
 					(!observer.options.attributeFilter ||
 						observer.options.attributeFilter.includes(item[PropertySymbol.name]))
 				) {
@@ -199,7 +199,7 @@ export default class ElementNamedNodeMap extends NamedNodeMap {
 				this[PropertySymbol.ownerElement][PropertySymbol.observers]
 			)) {
 				if (
-					observer.options.attributes &&
+					observer.options?.attributes &&
 					(!observer.options.attributeFilter ||
 						observer.options.attributeFilter.includes(removedItem[PropertySymbol.name]))
 				) {

diff --git a/packages/happy-dom/src/nodes/node/NodeUtility.ts b/packages/happy-dom/src/nodes/node/NodeUtility.ts
@@ -81,10 +81,10 @@ export default class NodeUtility {
 			});
 
 			for (const observer of (<Node>ancestorNode)[PropertySymbol.observers]) {
-				if (observer.options.subtree) {
+				if (observer.options?.subtree) {
 					(<Node>node)[PropertySymbol.observe](observer);
 				}
-				if (observer.options.childList) {
+				if (observer.options?.childList) {
 					observer.report(record);
 				}
 			}
@@ -124,10 +124,10 @@ export default class NodeUtility {
 			});
 
 			for (const observer of (<Node>ancestorNode)[PropertySymbol.observers]) {
-				if (observer.options.subtree) {
+				if (observer.options?.subtree) {
 					(<Node>node)[PropertySymbol.unobserve](observer);
 				}
-				if (observer.options.childList) {
+				if (observer.options?.childList) {
 					observer.report(record);
 				}
 			}
@@ -214,10 +214,10 @@ export default class NodeUtility {
 			});
 
 			for (const observer of (<Node>ancestorNode)[PropertySymbol.observers]) {
-				if (observer.options.subtree) {
+				if (observer.options?.subtree) {
 					(<Node>newNode)[PropertySymbol.observe](observer);
 				}
-				if (observer.options.childList) {
+				if (observer.options?.childList) {
 					observer.report(record);
 				}
 			}