From 94c564cbde6e1aa777175c41f0b06ba023e96fb4 Mon Sep 17 00:00:00 2001
From: marc <marc.garcia@marfeel.com>
Date: Thu, 25 Jul 2024 12:24:08 +0200
Subject: [PATCH 1/2] fix: allow ampshadow to be root for ContextNode

---
 src/core/context/node.js                     |  5 +++--
 src/core/context/types.d.ts                  |  3 +++
 test/unit/core/context/test-node-discover.js | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/core/context/node.js b/src/core/context/node.js
index cf6d5a6a80a0..7ac6d0624a24 100644
--- a/src/core/context/node.js
+++ b/src/core/context/node.js
@@ -15,6 +15,7 @@ import {Values} from './values';
 const NODE_PROP = '__AMP_NODE';
 const ASSIGNED_SLOT_PROP = '__AMP_ASSIGNED_SLOT';
 const AMP_PREFIX = 'AMP-';
+const AMPDOC_PROP = '__AMPDOC';
 
 // Relevant node types.
 // See https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeType.
@@ -192,14 +193,14 @@ export class ContextNode {
     this.name = name;
 
     /**
-     * Whether this node is a root. The Document DOM nodes are automatically
+     * Whether this node is a root. The Document DOM nodes and ampdoc roots are automatically
      * considered as roots. But other nodes can become roots as well
      * (e.g. shadow roots) via `setIsRoot()` API.
      *
      * @package
      * @type {boolean}
      */
-    this.isRoot = node.nodeType == DOCUMENT_NODE;
+    this.isRoot = node.nodeType == DOCUMENT_NODE || !!node[AMPDOC_PROP];
 
     /**
      * The root context node. Always available for a DOM node connected to a
diff --git a/src/core/context/types.d.ts b/src/core/context/types.d.ts
index 931c829535cc..94ca3e7cd8ea 100644
--- a/src/core/context/types.d.ts
+++ b/src/core/context/types.d.ts
@@ -1,4 +1,5 @@
 import {ContextNode} from './node';
+
 export interface IContextProp<T, DEP> {
   /**
    * A globally unique key. Extensions must use a fully qualified name such
@@ -92,5 +93,7 @@ declare global {
 
     // Used to map a Node to its assigned slot.
     __AMP_ASSIGNED_SLOT?: Node;
+
+    __AMPDOC: import('../../service/ampdoc-impl').AmpDoc;
   }
 }
diff --git a/test/unit/core/context/test-node-discover.js b/test/unit/core/context/test-node-discover.js
index 71147679e045..2a63de5e08d8 100644
--- a/test/unit/core/context/test-node-discover.js
+++ b/test/unit/core/context/test-node-discover.js
@@ -161,6 +161,23 @@ describes.realWin('ContextNode', {}, (env) => {
       });
     });
 
+    it('should create a ampdoc holder shadow root', () => {
+      const frag = doc.createDocumentFragment();
+
+      frag.__AMPDOC = {};
+
+      const cn = ContextNode.get(frag);
+      expect(cn.node).to.equal(frag);
+      // Parent always starts as null.
+      expectContext(cn, {
+        parent: null,
+        isRoot: false,
+        root: frag,
+        children: [],
+        discoverable: true,
+      });
+    });
+
     it('should create a document node', () => {
       const cn = ContextNode.get(doc);
       expect(cn.node).to.equal(doc);

From 38fb686480a0c83954c949223b98a2dba6b3b44a Mon Sep 17 00:00:00 2001
From: marc <marc.garcia@marfeel.com>
Date: Thu, 25 Jul 2024 12:52:57 +0200
Subject: [PATCH 2/2] fixes

---
 src/core/context/types.d.ts                  | 2 +-
 test/unit/core/context/test-node-discover.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/context/types.d.ts b/src/core/context/types.d.ts
index 94ca3e7cd8ea..3284e911432d 100644
--- a/src/core/context/types.d.ts
+++ b/src/core/context/types.d.ts
@@ -94,6 +94,6 @@ declare global {
     // Used to map a Node to its assigned slot.
     __AMP_ASSIGNED_SLOT?: Node;
 
-    __AMPDOC: import('../../service/ampdoc-impl').AmpDoc;
+    __AMPDOC?: import('../../service/ampdoc-impl').AmpDoc;
   }
 }
diff --git a/test/unit/core/context/test-node-discover.js b/test/unit/core/context/test-node-discover.js
index 2a63de5e08d8..77f48072f461 100644
--- a/test/unit/core/context/test-node-discover.js
+++ b/test/unit/core/context/test-node-discover.js
@@ -171,10 +171,10 @@ describes.realWin('ContextNode', {}, (env) => {
       // Parent always starts as null.
       expectContext(cn, {
         parent: null,
-        isRoot: false,
+        isRoot: true,
         root: frag,
         children: [],
-        discoverable: true,
+        discoverable: false,
       });
     });