@lwc/synthetic-shadow 2.5.9 → 2.6.1

package/dist/synthetic-shadow.js

@@ -194,7 +194,7 @@ const KEY__SYNTHETIC_MODE = '$$lwc-synthetic-mode';
 
 
 const hasNativeSymbolSupport = /*@__PURE__*/(() => Symbol('x').toString() === 'Symbol(x)')();
-/** version: 2.5.9 */
+/** version: 2.6.1 */
 
 /*
  * Copyright (c) 2018, salesforce.com, inc.
@@ -515,19 +515,6 @@ function arrayFromCollection(collection) {
   return cloned;
 }
 
-/**
- * Copyright (C) 2018 salesforce.com, inc.
- */
-
-if (!_globalThis.lwcRuntimeFlags) {
-  Object.defineProperty(_globalThis, 'lwcRuntimeFlags', {
-    value: create(null)
-  });
-}
-
-const runtimeFlags = _globalThis.lwcRuntimeFlags;
-/** version: 2.5.9 */
-
 /*
  * Copyright (c) 2018, salesforce.com, inc.
  * All rights reserved.
@@ -587,19 +574,9 @@ function getEventListenerWrapper(fnOrObj) {
         assert.invariant(isFalse(isSyntheticShadowHost(currentTarget)), 'This routine should not be used to wrap event listeners for host elements and shadow roots.');
       }
 
-      const {
-        composed
-      } = event;
-      let shouldInvoke;
+      const actualTarget = getActualTarget(event);
 
-      if (runtimeFlags.ENABLE_NON_COMPOSED_EVENTS_LEAKAGE) {
-        shouldInvoke = !(eventToShadowRootMap.has(event) && isFalse(composed));
-      } else {
-        const actualTarget = getActualTarget(event);
-        shouldInvoke = shouldInvokeListener(event, actualTarget, currentTarget);
-      }
-
-      if (!shouldInvoke) {
+      if (!shouldInvokeListener(event, actualTarget, currentTarget)) {
         return;
       }
 
@@ -619,25 +596,6 @@ function getEventListenerWrapper(fnOrObj) {
  * For full license text, see the LICENSE file in the repo root or https://opensource.org/licenses/MIT
  */
 const eventToContextMap = new WeakMap();
-
-function isChildNode(root, node) {
-  return !!(compareDocumentPosition.call(root, node) & DOCUMENT_POSITION_CONTAINED_BY);
-}
-
-const GET_ROOT_NODE_CONFIG_FALSE = {
-  composed: false
-};
-
-function getRootNodeHost(node, options) {
-  let rootNode = node.getRootNode(options);
-
-  if (isSyntheticShadowRoot(rootNode)) {
-    rootNode = getHost(rootNode);
-  }
-
-  return rootNode;
-}
-
 const customElementToWrappedListeners = new WeakMap();
 
 function getEventMap(elm) {
@@ -681,16 +639,9 @@ function getWrappedShadowRootListener(listener) {
         currentTarget = getShadowRoot(currentTarget);
       }
 
-      let shouldInvoke;
-
-      if (runtimeFlags.ENABLE_NON_COMPOSED_EVENTS_LEAKAGE) {
-        shouldInvoke = shouldInvokeShadowRootListener(event);
-      } else {
-        const actualTarget = getActualTarget(event);
-        shouldInvoke = shouldInvokeListener(event, actualTarget, currentTarget);
-      }
+      const actualTarget = getActualTarget(event);
 
-      if (shouldInvoke) {
+      if (shouldInvokeListener(event, actualTarget, currentTarget)) {
         listener.call(currentTarget, event);
       }
     };
@@ -717,16 +668,9 @@ function getWrappedCustomElementListener(listener) {
     customElementWrappedListener = function (event) {
       // currentTarget is always defined inside an event listener
       const currentTarget = eventCurrentTargetGetter.call(event);
-      let shouldInvoke;
+      const actualTarget = getActualTarget(event);
 
-      if (runtimeFlags.ENABLE_NON_COMPOSED_EVENTS_LEAKAGE) {
-        shouldInvoke = shouldInvokeCustomElementListener(event);
-      } else {
-        const actualTarget = getActualTarget(event);
-        shouldInvoke = shouldInvokeListener(event, actualTarget, currentTarget);
-      }
-
-      if (shouldInvoke) {
+      if (shouldInvokeListener(event, actualTarget, currentTarget)) {
         listener.call(currentTarget, event);
       }
     };
@@ -847,70 +791,6 @@ function detachDOMListener(elm, type, wrappedListener) {
   }
 }
 
-function shouldInvokeCustomElementListener(event) {
-  const {
-    composed
-  } = event;
-
-  if (isTrue(composed)) {
-    // Listeners on host elements should always be invoked for {composed: true} events.
-    return true;
-  } // If this {composed: false} event was dispatched on any root.
-
-
-  if (eventToShadowRootMap.has(event)) {
-    return false;
-  }
-
-  const target = eventTargetGetter.call(event);
-  const currentTarget = eventCurrentTargetGetter.call(event); // If this {composed: false} event was dispatched on the current target host.
-
-  if (target === currentTarget) {
-    return true;
-  } // At this point the event must be {bubbles: true, composed: false} and was dispatched from a
-  // shadow-excluding descendant node. In this case, we only invoke the listener if the target
-  // host was assigned to a slot in the composed subtree of the current target host.
-
-
-  const targetHost = getRootNodeHost(target, GET_ROOT_NODE_CONFIG_FALSE);
-  const currentTargetHost = currentTarget;
-  return isChildNode(targetHost, currentTargetHost);
-}
-
-function shouldInvokeShadowRootListener(event) {
-  const {
-    composed
-  } = event;
-  const target = eventTargetGetter.call(event);
-  const currentTarget = eventCurrentTargetGetter.call(event); // If the event was dispatched on the host or its root.
-
-  if (target === currentTarget) {
-    // Invoke the listener if the event was dispatched directly on the root.
-    return eventToShadowRootMap.get(event) === getShadowRoot(target);
-  } // At this point the event is {bubbles: true} and was dispatched from a shadow-including descendant node.
-
-
-  if (isTrue(composed)) {
-    // Invoke the listener if the event is {composed: true}.
-    return true;
-  } // At this point the event must be {bubbles: true, composed: false}.
-
-
-  if (isTrue(eventToShadowRootMap.has(event))) {
-    // Don't invoke the listener because the event was dispatched on a descendant root.
-    return false;
-  }
-
-  const targetHost = getRootNodeHost(target, GET_ROOT_NODE_CONFIG_FALSE);
-  const currentTargetHost = currentTarget;
-  const isCurrentTargetSlotted = isChildNode(targetHost, currentTargetHost); // At this point the event must be {bubbles: true, composed: false} and was dispatched from a
-  // shadow-excluding descendant node. In this case, we only invoke the listener if the target
-  // host was assigned to a slot in the composed subtree of the current target host, or the
-  // descendant node is in the shadow tree of the current root.
-
-  return isCurrentTargetSlotted || targetHost === currentTargetHost;
-}
-
 function addCustomElementEventListener(type, listener, _options) {
   if (process.env.NODE_ENV !== 'production') {
     if (!isFunction(listener)) {
@@ -1632,6 +1512,19 @@ function getOuterHTML(node) {
   }
 }
 
+/**
+ * Copyright (C) 2018 salesforce.com, inc.
+ */
+
+if (!_globalThis.lwcRuntimeFlags) {
+  Object.defineProperty(_globalThis, 'lwcRuntimeFlags', {
+    value: create(null)
+  });
+}
+
+const runtimeFlags = _globalThis.lwcRuntimeFlags;
+/** version: 2.6.1 */
+
 /*
  * Copyright (c) 2018, salesforce.com, inc.
  * All rights reserved.
@@ -5757,4 +5650,4 @@ defineProperty(Element.prototype, '$domManual$', {
 
   configurable: true
 });
-/** version: 2.5.9 */
+/** version: 2.6.1 */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@lwc/synthetic-shadow",
-    "version": "2.5.9",
+    "version": "2.6.1",
     "description": "Synthetic Shadow Root for LWC",
     "homepage": "https://lwc.dev/",
     "repository": {
@@ -36,8 +36,8 @@
         "access": "public"
     },
     "devDependencies": {
-        "@lwc/features": "2.5.9",
-        "@lwc/shared": "2.5.9"
+        "@lwc/features": "2.6.1",
+        "@lwc/shared": "2.6.1"
     },
-    "gitHead": "3e50c5c599f5eb7af78bcfd6f634df10e8117145"
+    "gitHead": "65ae5d96106495314904cade2522cceef2067229"
 }