Skip to content

use shadowroot.host instead of weakmap #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
keithamus merged 1 commit into from
Oct 10, 2022
Merged

use shadowroot.host instead of weakmap #284

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/targetable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,8 @@ const [targets, getTargets, initializeTargets] = createMark<Element>(

function setTarget(el: Element, controller: Element | ShadowRoot, tag: string, key: string): void {
const get = tag === 'data-targets' ? getTargets : getTarget
if (controller instanceof ShadowRoot) {
controller = controllers.get(controller)!
}
if (controller instanceof ShadowRoot) controller = controller.host

if (controller && get(controller)?.has(key)) {
;(controller as unknown as Record<PropertyKey, unknown>)[key] = {}
}
Expand All @@ -67,7 +66,6 @@ function setTarget(el: Element, controller: Element | ShadowRoot, tag: string, k
registerTag('data-target', (str: string) => str.split('.'), setTarget)
registerTag('data-targets', (str: string) => str.split('.'), setTarget)
const shadows = new WeakMap<Element, ShadowRoot>()
const controllers = new WeakMap<ShadowRoot, Element>()

const findTarget = (controller: Element, selector: string, many: boolean) => () => {
const nodes = []
Expand Down Expand Up @@ -113,7 +111,6 @@ export const targetable = createAbility(
[attachShadowCallback](root: ShadowRoot) {
super[attachShadowCallback]?.(root)
shadows.set(this, root)
controllers.set(root, this)
observeElementForTags(root)
}
}
Expand Down